OCPBUGS-81745: [release-4.21] Honor AWS AMI override in NodePool token generation by bryan-cox · Pull Request #8170 · openshift/hypershift

bryan-cox · 2026-04-06T17:44:30Z

Summary

Manual backport of #7675 to release-4.21 — the automated cherry-pick failed due to merge conflicts in token.go.

On release-4.21, the karpenter label code was refactored to use t.userData.ami (computed in NewToken()), so the fix was adapted to check the AMI override in NewToken() rather than in the label-setting code path.

Changes

token.go: Check nodePool.Spec.Platform.AWS.AMI before falling back to defaultNodePoolAMI() in NewToken()
nodepool_controller.go: Add nil check for releaseImage.StreamMetadata in defaultNodePoolAMI()
nodepool_controller_test.go: Add test case for nil StreamMetadata scenario

References

Original PR: OCPBUGS-76350: Honor AWS AMI override in NodePool token generation #7675
JIRA: OCPBUGS-81745 (backport of OCPBUGS-76350)

openshift-ci-robot · 2026-04-06T17:44:37Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-81745, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.z) matches configured target version for branch (4.21.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-76350 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-76350 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Manual backport of #7675 to release-4.21 — the automated cherry-pick failed due to merge conflicts in token.go.

On release-4.21, the karpenter label code was refactored to use t.userData.ami (computed in NewToken()), so the fix was adapted to check the AMI override in NewToken() rather than in the label-setting code path.

Changes

token.go: Check nodePool.Spec.Platform.AWS.AMI before falling back to defaultNodePoolAMI() in NewToken()

nodepool_controller.go: Add nil check for releaseImage.StreamMetadata in defaultNodePoolAMI()

nodepool_controller_test.go: Add test case for nil StreamMetadata scenario

References

Original PR: OCPBUGS-76350: Honor AWS AMI override in NodePool token generation #7675

JIRA: OCPBUGS-81745 (backport of OCPBUGS-76350)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2026-04-06T17:44:55Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [bryan-cox]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

coderabbitai · 2026-04-06T17:45:13Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)

do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: ba13bd59-876e-4198-8d63-77e7409541bb

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

…n generation Backport of openshift#7675 to release-4.21. The NewToken() function always called defaultNodePoolAMI() without checking if a user-specified AMI override was set via nodePool.Spec.Platform.AWS.AMI. This caused failures in AWS ISO (classified) regions where release image metadata may not contain region data, and users must specify a custom AMI. This fix checks for the AMI override before falling back to defaultNodePoolAMI(), and adds a nil check for StreamMetadata to prevent nil pointer dereference when stream metadata is unavailable.

enxebre · 2026-04-07T11:51:31Z

/lgtm

jiezhao16 · 2026-04-07T21:00:22Z

/verified by @jiezhao16

openshift-ci-robot · 2026-04-07T21:00:35Z

@jiezhao16: This PR has been marked as verified by @jiezhao16.

Details

In response to this:

/verified by @jiezhao16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

bryan-cox · 2026-04-08T13:21:48Z

/test e2e-azure-aks-external-oidc

openshift-ci · 2026-04-08T14:48:57Z

@bryan-cox: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot · 2026-04-08T14:54:12Z

@bryan-cox: Jira Issue Verification Checks: Jira Issue OCPBUGS-81745
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-81745 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Summary

Manual backport of #7675 to release-4.21 — the automated cherry-pick failed due to merge conflicts in token.go.

On release-4.21, the karpenter label code was refactored to use t.userData.ami (computed in NewToken()), so the fix was adapted to check the AMI override in NewToken() rather than in the label-setting code path.

Changes

token.go: Check nodePool.Spec.Platform.AWS.AMI before falling back to defaultNodePoolAMI() in NewToken()

nodepool_controller.go: Add nil check for releaseImage.StreamMetadata in defaultNodePoolAMI()

nodepool_controller_test.go: Add test case for nil StreamMetadata scenario

References

Original PR: OCPBUGS-76350: Honor AWS AMI override in NodePool token generation #7675

JIRA: OCPBUGS-81745 (backport of OCPBUGS-76350)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci Bot added the do-not-merge/needs-area label Apr 6, 2026

openshift-ci Bot requested review from csrwng and devguyio April 6, 2026 17:44

openshift-ci Bot added the area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release label Apr 6, 2026

openshift-ci Bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Apr 6, 2026

bryan-cox force-pushed the cherry-pick-OCPBUGS-81745-to-release-4.21 branch from 7c9ffd7 to 9011e64 Compare April 6, 2026 20:20

openshift-ci Bot assigned enxebre Apr 7, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 7, 2026

enxebre added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 8, 2026

openshift-merge-bot Bot merged commit b722bf6 into openshift:release-4.21 Apr 8, 2026
17 checks passed

bryan-cox deleted the cherry-pick-OCPBUGS-81745-to-release-4.21 branch April 8, 2026 15:11

Navigation Menu

Uh oh!

OCPBUGS-81745: [release-4.21] Honor AWS AMI override in NodePool token generation - #8170

OCPBUGS-81745: [release-4.21] Honor AWS AMI override in NodePool token generation#8170
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.21from
bryan-cox:cherry-pick-OCPBUGS-81745-to-release-4.21

bryan-cox commented Apr 6, 2026

Uh oh!

openshift-ci-robot commented Apr 6, 2026

Summary

Changes

References

Uh oh!

openshift-ci Bot commented Apr 6, 2026

Uh oh!

coderabbitai Bot commented Apr 6, 2026 •

edited

Loading

Review skipped

Uh oh!

enxebre commented Apr 7, 2026

Uh oh!

jiezhao16 commented Apr 7, 2026

Uh oh!

openshift-ci-robot commented Apr 7, 2026

Uh oh!

bryan-cox commented Apr 8, 2026

Uh oh!

openshift-ci Bot commented Apr 8, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 8, 2026

Summary

Changes

References

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

bryan-cox commented Apr 6, 2026

Summary

Changes

References

Uh oh!

openshift-ci-robot commented Apr 6, 2026

Summary

Changes

References

Uh oh!

openshift-ci Bot commented Apr 6, 2026

Uh oh!

coderabbitai Bot commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

enxebre commented Apr 7, 2026

Uh oh!

jiezhao16 commented Apr 7, 2026

Uh oh!

openshift-ci-robot commented Apr 7, 2026

Uh oh!

bryan-cox commented Apr 8, 2026

Uh oh!

openshift-ci Bot commented Apr 8, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 8, 2026

Summary

Changes

References

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

coderabbitai Bot commented Apr 6, 2026 •

edited

Loading